dgit.raspbian.org Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0a6f2ff 219afb8)

author	Tom Tromey <tromey@redhat.com>
	Sun, 7 Jul 2013 05:18:58 +0000 (23:18 -0600)
committer	Tom Tromey <tromey@redhat.com>
	Sun, 7 Jul 2013 05:18:58 +0000 (23:18 -0600)
commit	6dacdad5fcb278e5a16b38bb81786aac9ca27be4
tree	f5f331ea361ba0f99e0f9b638d183ad492a7da31	tree \| snapshot
parent	0a6f2ff0c8ceb29703e76cddd46ea3f176dd873a	commit \| diff
parent	219afb88d9d484393418820d1c08dc93299110ec	commit \| diff

merge from trunk

this merges frmo trunk and fixes various build issues.
this needed a few ugly tweaks.
this hangs in "make check" now

19 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
doc/lispref/Makefile.in	diff1 \|	diff2 \|	blob \| history
doc/lispref/elisp.texi	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	diff1 \|	diff2 \|	blob \| history
src/Makefile.in	diff1 \|	diff2 \|	blob \| history
src/alloc.c	diff1 \|	diff2 \|	blob \| history
src/buffer.c	diff1 \|	diff2 \|	blob \| history
src/bytecode.c	diff1 \|	diff2 \|	blob \| history
src/data.c	diff1 \|	diff2 \|	blob \| history
src/emacs.c	diff1 \|	diff2 \|	blob \| history
src/eval.c	diff1 \|	diff2 \|	blob \| history
src/lisp.h	diff1 \|	diff2 \|	blob \| history
src/print.c	diff1 \|	diff2 \|	blob \| history
src/process.c	diff1 \|	diff2 \|	blob \| history
src/process.h	diff1 \|	diff2 \|	blob \| history
src/systime.h	diff1 \|	diff2 \|	blob \| history
src/thread.c	diff1 \|	\|	blob \| history
src/thread.h	diff1 \|	\|	blob \| history
src/window.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.